SparkN0de-git - /page/commit.mu

Micron Document

--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

| SparkN0de-git | SparkN0de |

Node / ReticulumProjects / NomadNet.git / commits / a876c09

Commit a876c09b4c71e1d8082566f08c07ae5ac0e23d93

󰉖 Browse tree at this commit

Parents : 77eca5d bf0b08c

Author : markqvist <mark@unsigned.io>

Signature : Signature validation error

Date : 2024-01-18T15:38:11+01:00

Committer : GitHub <noreply@github.com>

Date : 2024-01-18T15:38:11+01:00

Merge branch 'master' into urwid_constants

Diff

diff --cc nomadnet/ui/textui/Config.py

index 618e8c6,f94037c..36d92a5

--- a/nomadnet/ui/textui/Config.py

+++ b/nomadnet/ui/textui/Config.py

@@@ -12,8 -12,8 +12,8 @@@ class ConfigDisplayShortcuts()

class ConfigFiller(urwid.WidgetWrap):

def __init__(self, widget, app):

self.app = app

- self.filler = urwid.Filler(widget, "top")

+ self.filler = urwid.Filler(widget, urwid.TOP)

- urwid.WidgetWrap.__init__(self, self.filler)

+ super().__init__(self.filler)

def keypress(self, size, key):

diff --cc nomadnet/ui/textui/Network.py

index ea0bc98,f0c40a3..5ae371f

--- a/nomadnet/ui/textui/Network.py

+++ b/nomadnet/ui/textui/Network.py

@@@ -244,9 -232,9 +244,9 @@@ class AnnounceInfo(urwid.WidgetWrap)

pile = urwid.Pile(pile_widgets)

- self.display_widget = urwid.Filler(pile, valign="top", height="pack")

+ self.display_widget = urwid.Filler(pile, valign=urwid.TOP, height=urwid.PACK)

- urwid.WidgetWrap.__init__(self, urwid.LineBox(self.display_widget, title="Announce Info"))

+ super().__init__(urwid.LineBox(self.display_widget, title="Announce Info"))

class AnnounceStreamEntry(urwid.WidgetWrap):

@@@ -704,9 -679,9 +704,9 @@@ class KnownNodeInfo(urwid.WidgetWrap)

button_columns.focus_position = 0

- self.display_widget = urwid.Filler(pile, valign="top", height="pack")

+ self.display_widget = urwid.Filler(pile, valign=urwid.TOP, height=urwid.PACK)

- urwid.WidgetWrap.__init__(self, urwid.LineBox(self.display_widget, title="Node Info"))

+ super().__init__(urwid.LineBox(self.display_widget, title="Node Info"))

# Yes, this is weird. There is a bug in Urwid/ILB that causes

@@@ -748,19 -723,10 +748,19 @@@ class KnownNodes(urwid.WidgetWrap)

else:

self.no_content = True

widget_style = "inactive_text"

- self.pile = urwid.Pile([urwid.Text(("warning_text", g["info"]+"\n"), align="center"), SelectText(("warning_text", "Currently, no nodes are saved\n\nCtrl+L to view the announce stream\n\n"), align="center")])

- self.display_widget = urwid.Filler(self.pile, valign="top", height="pack")

+ self.pile = urwid.Pile([

+ urwid.Text(("warning_text", g["info"]+"\n"), align=urwid.CENTER),

+ SelectText(

+ (

+ "warning_text",

+ "Currently, no nodes are saved\n\nCtrl+L to view the announce stream\n\n",

+ ),

+ align=urwid.CENTER,

+ ),

+ ])

+ self.display_widget = urwid.Filler(self.pile, valign=urwid.TOP, height=urwid.PACK)

- urwid.WidgetWrap.__init__(self, urwid.AttrMap(urwid.LineBox(self.display_widget, title="Saved Nodes"), widget_style))

+ super().__init__(urwid.AttrMap(urwid.LineBox(self.display_widget, title="Saved Nodes"), widget_style))

def keypress(self, size, key):

if key == "up" and (self.no_content or self.ilb.first_item_is_selected()):

──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────